190. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

190.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/category	custom_block.phtml	2015-11-29 22:02:46 +0000
2	/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/category	custom_block.phtml	2021-01-18 06:34:30 +0000

190.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	14
Changed	1	8
Inserted	0	0
Removed	0	0

190.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

190.4 Active regular expressions

No regular expressions were active.

190.5 Comparison detail

1	<?php	1	<?php
2	$product_view = $this->getConfig('porto_settings/category');	2	$product_view = $this->getConfig('porto_settings/category');
3	$block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');	3	$block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
4	if($block) {	4	if($block) {
5	$block->setBlockId($product_view['side_custom_block']);	5	$block->setBlockId($product_view['side_custom_block']);
6	}	6	}
7	if($block){	7	if($block){ ?>
8	echo $block->toHtml();	8	<div class="side-custom-block">
9	}	9	<?php echo $block->toHtml(); ?>
		10	</div>
		11	<?php }
10	?>	12	?>